getenv() can return NULL.

2008-03-16  Mukund Sivaraman <muks@mukund.org>

        * babl/babl-extension.c: getenv() can return NULL.

        * babl/babl-memory.c: Check for NULL in babl_strcat().

svn path=/trunk/; revision=293

diff --git a/ChangeLog b/ChangeLog
index ca5bf9f50c1e8c6a4a50b8e70cd181d786e1f6d5..0c33dedc1df1230b31b496ad7a676da178dd5741 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-16  Mukund Sivaraman <muks@mukund.org>
+
+       * babl/babl-extension.c: getenv() can return NULL.
+
+       * babl/babl-memory.c: Check for NULL in babl_strcat().  
+
 2008-03-16  Mukund Sivaraman <muks@mukund.org>
 
        * babl/babl-image.c: Added missing va_end()s.

diff --git a/babl/babl-extension.c b/babl/babl-extension.c
index 6a3bb57d737c3a86aaa9f6a966711ab053c10586..ebadb5f5dc93feda6d5d8c60fc1fcea4133f6806 100644 (file)
--- a/babl/babl-extension.c
+++ b/babl/babl-extension.c
@@ -272,10 +272,13 @@ expand_path (char *path)
 
   while (*src)
     {
+      char *home;
       switch (*src)
         {
           case '~':
-            dst = babl_strcat (dst, getenv ("HOME"));
+            home = getenv ("HOME");
+            if (NULL != home)
+              dst = babl_strcat (dst, home);
             break;
 
           default:

diff --git a/babl/babl-memory.c b/babl/babl-memory.c
index f0c80a53e36b43ac9fc3eda17af7e672c30e8b98..a5b407e413bbb1e9473a06ee7a4a74176d808b1a 100644 (file)
--- a/babl/babl-memory.c
+++ b/babl/babl-memory.c
@@ -298,6 +298,9 @@ babl_strcat (char       *dest,
   int   src_len;
   int   dst_len;
 
+  if (NULL == src)
+    return dest;
+
   src_len = strlen (src);
   if (!dest)
     {